feat(agent_install): only install required packages [SMAGENT-6558] #465
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iurly
force-pushed
the
gerlando-agent-packages
branch
2 times, most recently
from
8aefeef to
6ee0707
Compare
iurly
changed the title
iurly
requested review from
aroberts87 and
mprzybylski
and removed request for
aroberts87
aroberts87
reviewed
Apr 10, 2024
plugins/filter/agent.py
Outdated
Comment on lines
42
to
65
| all_packages = { | ||
| "draios-agent": False, | ||
| "draios-agent-slim": False, | ||
| "draios-agent-kmodule": False, | ||
| "draios-agent-legacy-ebpf": False, | ||
| } | ||
| if pinned: | ||
| version = to_agent_version(data) | ||
| minver = LooseVersion("1.0.0") | ||
| maxver = LooseVersion("13.1.0") | ||
| older = minver < LooseVersion(version) < maxver | ||
| if older: | ||
| all_packages ["draios-agent"] = True | ||
| else: | ||
| dt = to_agent_driver_type(data) | ||
| if dt == "universal_ebpf": | ||
| all_packages ["draios-agent-slim"] = True | ||
| elif dt == "legacy_ebpf": | ||
| all_packages ["draios-agent-slim"] = True | ||
| all_packages ["draios-agent-legacy-ebpf"] = True | ||
| else: | ||
| all_packages ["draios-agent"] = True | ||
| all_packages ["draios-agent-slim"] = True | ||
| all_packages ["draios-agent-kmodule"] = True |
There was a problem hiding this comment.
At least to me, keying the package map off of the driver type makes things a bit more straight forward. As an example:
package_map = {
"universal_ebpf": ["draios-agent-slim"],
"legacy_ebpf": ["draios-agent-slim", "draios-agent-legacy-ebpf"],
"kmod": ["draios-agent", "draios-agent-slim", "draios'agent-kmodule"]
}
...
if older:
return ["draios-agent"]
return package_map[to_agent_driver_type(data)]In this way we don't have to manually "flip the switch" for packages to install for a given driver and also there is a clear mapping between driver type and package.
The to_agent_install_packages() and to_agent_uninstall_packages() methods can be simplified to something like this as well:
to_agent_uninstall_packages()
# hacky global. could make better.
AGENT_PACKAGES = ["draios-agent", "draios-agent-legacy-ebpf", "draios-agent-slim", "draios-agent-kmodule"]
...
def to_agent_uninstall_packages(data):
return [p for p in AGENT_PACKAGES if p not in to_agent_packages(data)]to_agent_install_packages(data):
def to_agent_install_packages(data):
return to_agent_packages(data)
iurly
force-pushed
the
gerlando-agent-packages
branch
from
2a3b3c3 to
c4080f7
Compare
rework the role so to only install the packages required by the selected driver (and therefore, the respective dependencies). Also, remove packages which are no longer required by the selected driver type. Notice we need to craft a list augmented with the selected version, if one is present. Most of the selection logic (namely, based on the version) resides in the 'agent' filter which is probably far from ideal but gets the job done.
REVERTME: try to fool envsubst https://stackoverflow.com/a/61259844
iurly
force-pushed
the
gerlando-agent-packages
branch
from
c618a61 to
9e6c06a
Compare
iurly
force-pushed
the
gerlando-agent-packages
branch
from
4c5af01 to
8314750
Compare
iurly
force-pushed
the
gerlando-agent-packages
branch
from
8314750 to
e027784
Compare
aroberts87
approved these changes
Apr 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rework the role so to only install the packages required by the
selected driver (and therefore, the respective dependencies).
Also, remove packages which are no longer required by the
selected driver type.
Notice we need to craft a list augmented with the selected
version, if one is present.
Most of the selection logic (namely, based on the version)
resides in the 'agent' filter which is probably far from
ideal but gets the job done.
Side changes to make CI pass on this PR: